From c253bc31654907d4a180ce0987646e62eb458d28 Mon Sep 17 00:00:00 2001
From: William Jon McCann <william.jon.mccann@gmail.com>
Date: Mon, 7 Apr 2014 17:52:20 -0400
Subject: [PATCH] file-chooser: use an action bar for extra widgets area

https://bugzilla.gnome.org/show_bug.cgi?id=722211
---
 gtk/resources/ui/gtkfilechooserdialog.ui |  3 ++-
 gtk/resources/ui/gtkfilechooserwidget.ui | 12 ++----------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/gtk/resources/ui/gtkfilechooserdialog.ui b/gtk/resources/ui/gtkfilechooserdialog.ui
index c08ebd762a..fa0a3683ad 100644
--- a/gtk/resources/ui/gtkfilechooserdialog.ui
+++ b/gtk/resources/ui/gtkfilechooserdialog.ui
@@ -13,9 +13,10 @@
         <property name="border_width">0</property>
         <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
-        <property name="spacing">2</property>
+        <property name="spacing">0</property>
         <child internal-child="action_area">
           <object class="GtkButtonBox" id="dialog-action_area1">
+            <property name="border_width">6</property>
             <property name="can_focus">False</property>
             <property name="layout_style">end</property>
             <child>
diff --git a/gtk/resources/ui/gtkfilechooserwidget.ui b/gtk/resources/ui/gtkfilechooserwidget.ui
index 9752e210e1..1a0751c89d 100644
--- a/gtk/resources/ui/gtkfilechooserwidget.ui
+++ b/gtk/resources/ui/gtkfilechooserwidget.ui
@@ -347,18 +347,13 @@
       </packing>
     </child>
     <child>
-      <object class="GtkBox" id="extra_and_filters">
+      <object class="GtkActionBar" id="extra_and_filters">
         <property name="visible">True</property>
-        <property name="border_width">10</property>
         <child>
           <object class="GtkBox" id="extra_align">
             <property name="can_focus">False</property>
+            <property name="spacing">12</property>
           </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="filter_combo_hbox">
@@ -386,10 +381,7 @@
             </child>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
             <property name="pack_type">end</property>
-            <property name="position">1</property>
           </packing>
         </child>
       </object>
-- 
2.30.2